Auto merge of #2691 - serprex:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 15 May 2016 01:43:48 +0000 (18:43 -0700)
committerbors <bors@rust-lang.org>
Sun, 15 May 2016 01:43:48 +0000 (18:43 -0700)
Remove dependency on time in favor of std::time


Trivial merge